Merge version 25.04.3-1+rpi1 and 25.12.2-1 to produce 25.12.2-1+rpi1 forky-staging archive/raspbian/25.12.2-1+rpi1 raspbian/25.12.2-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sun, 15 Feb 2026 09:01:19 +0000 (09:01 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Sun, 15 Feb 2026 09:01:19 +0000 (09:01 +0000)
1  2 
debian/changelog
debian/control

index 7e5c5996651345e7ef7a08c3be583e71f433d29d,b3c352a2d6913b03d42922f14b1391af3a85a8e5..b1698445d5e67dd879ff9ab8fffdc3b624c81407
@@@ -1,9 -1,71 +1,78 @@@
- tokodon (25.04.3-1+rpi1) trixie-staging; urgency=medium
++tokodon (25.12.2-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 25.04.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 02 Jun 2025 08:24:55 +0000]
 +  * Remove armhf from qt6-webview-dev architecture list.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Sep 2025 12:12:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 15 Feb 2026 09:01:18 +0000
++
+ tokodon (25.12.2-1) unstable; urgency=medium
+   * New upstream release:
+     - does not install tokodon-offline anymore
+   * Update the patches:
+     - upstream_Include-QTimer.patch: drop, backported from upstream
+   * Drop tokodon-offline removal. (Closes: #1126609)
+  -- Pino Toscano <pino@debian.org>  Thu, 05 Feb 2026 20:46:41 +0100
+ tokodon (25.12.1-2) unstable; urgency=medium
+   * Drop Priority: optional, no more needed since dpkg 1.22.13.
+   * upstream_revert_357ef28c_accountpage-use-formlinkdelegate-for-open-ser.patch:
+     drop, as now kirigami-addons 1.10+ is required.
+   * Backport upstream commit de798456ff668f39a447f884eac9780e3f528238 to fix the
+     build on architectures without QtWebView; patch
+     upstream_Include-QTimer.patch.
+   * Include /usr/share/dpkg/architecture.mk in rules, to make sure that
+     $(DEB_HOST_ARCH) can be used.
+   * Do not ship tokodon-offline, as it is a testing application with dummy data.
+  -- Pino Toscano <pino@debian.org>  Sat, 17 Jan 2026 11:42:20 +0100
+ tokodon (25.12.1-1) unstable; urgency=medium
+   [ Aurélien COUDERC ]
+   * New upstream release (25.12.1).
+   * Update build-deps and deps with the info from cmake.
+   * Bump Standards-Version to 4.7.3, no change required.
+   * Switch to debian/watch format version 5.
+   * Add/update Heiko Becker’s key in upstream keyring.
+   * Refresh copyright information.
+  -- Aurélien COUDERC <coucouf@debian.org>  Wed, 14 Jan 2026 22:07:58 +0100
+ tokodon (25.08.1-1) unstable; urgency=medium
+   * New upstream release.
+   * Update the patches:
+     - upstream_revert_357ef28c_accountpage-use-formlinkdelegate-for-open-ser.patch:
+       refresh/update
+     - upstream_128cdaa7_Fix-a-crash-when-trying-to-block-an-account-through-the-post-menu.patch:
+       drop, backported from upstream
+     - upstream_4f09a6e8_Add-mute-block-management-on-the-safety-page.patch:
+       drop, backported from upstream
+     - upstream_5587bbb9_Use-QLatin1String-in-SocialGraphModel.patch: drop,
+       backported from upstream
+     - upstream_fc886374_Playback-audio-in-video-attachments.patch: drop,
+       backported from upstream
+     - upstream_9eb657e1_Fix-crash-when-trying-to-save-less-than-the-max-number-of-fields.patch:
+       drop, backported from upstream
+     - upstream_b319e681_Add-a-toggle-in-account-settings-for-search-indexing.patch:
+       drop, backported from upstream
+     - upstream_4643870b_Make-sure-that-toggling-account-options-affects-the-correct-account.patch:
+       drop, backported from upstream
+     - upstream_df89658d_Fix-possible-erroneous-trailing-space-in-OAuth-scope-parameter.patch:
+       drop, backported from upstream
+   * Update the build dependencies according to the upstream build system:
+     - bump KF packages to 6.12.0
+     - add libkunifiedpush-dev, qcoro-qt6-dev, qml6-module-org-kde-kitemmodels,
+       qml6-module-org-kde-prison, and qml6-module-org-kde-sonnet
+     - remove unused libmpvqt-dev, and libqqc2breezestyle-dev
+   * Concatenate all the keys in debian/upstream/signing-key.asc.
+   * Drop Rules-Requires-Root: no, no more needed since Debian trixie.
+   * Build with -Os on armhf to workaround memory issues. (Closes: #1116228)
+  -- Pino Toscano <pino@debian.org>  Fri, 26 Sep 2025 10:11:26 +0200
  
  tokodon (25.04.3-1) unstable; urgency=medium
  
diff --cc debian/control
Simple merge